From eb3049d6b5608aa7391f1eef82e52d8959c27373 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 8 Feb 2018 04:31:05 +0100
Subject: [PATCH] pointerfocus: Don't include gtk.h

Also fix up gtktypes.h to include the required glib.h for G_BEGIN_DECLS
and gtkdnd.c to include missing includes.
---
 gtk/gtkdnd.c                 | 23 ++++++++++-------------
 gtk/gtkdndprivate.h          |  8 ++++----
 gtk/gtkpointerfocus.c        |  2 ++
 gtk/gtkpointerfocusprivate.h |  2 +-
 gtk/gtktypes.h               |  2 ++
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 14d9c34645..a266845e2e 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -24,27 +24,24 @@
 
 #include "config.h"
 
-#include "gtkdnd.h"
 #include "gtkdndprivate.h"
-#include "gtksettingsprivate.h"
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "gdk/gdk.h"
-
-#include "gdk/gdkcontentformatsprivate.h"
 
 #include "gtkdragdest.h"
 #include "gtkimageprivate.h"
 #include "gtkintl.h"
-#include "gtktooltipprivate.h"
-#include "gtkwindow.h"
+#include "gtkmain.h"
 #include "gtkselectionprivate.h"
+#include "gtksettingsprivate.h"
+#include "gtktooltipprivate.h"
+#include "gtkwidgetprivate.h"
 #include "gtkwindowgroup.h"
 #include "gtkwindowprivate.h"
-#include "gtkwidgetprivate.h"
+
+#include "gdk/gdkcontentformatsprivate.h"
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 
 /**
diff --git a/gtk/gtkdndprivate.h b/gtk/gtkdndprivate.h
index 5691451e30..854316ce5d 100644
--- a/gtk/gtkdndprivate.h
+++ b/gtk/gtkdndprivate.h
@@ -19,12 +19,12 @@
 #ifndef __GTK_DND_PRIVATE_H__
 #define __GTK_DND_PRIVATE_H__
 
+#include "gtkdnd.h"
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkdragdest.h>
-
+#include "gtkdragdest.h"
 #include "gtkimagedefinitionprivate.h"
+#include "gtkselection.h"
+#include "gtkwidget.h"
 
 typedef struct _GtkDragDestSite GtkDragDestSite;
 struct _GtkDragDestSite
diff --git a/gtk/gtkpointerfocus.c b/gtk/gtkpointerfocus.c
index 5229e39e12..6c2c90f455 100644
--- a/gtk/gtkpointerfocus.c
+++ b/gtk/gtkpointerfocus.c
@@ -15,6 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include "gtkpointerfocusprivate.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkpointerfocusprivate.h b/gtk/gtkpointerfocusprivate.h
index c7ffd90f97..02ab6e5c82 100644
--- a/gtk/gtkpointerfocusprivate.h
+++ b/gtk/gtkpointerfocusprivate.h
@@ -18,7 +18,7 @@
 #ifndef _GTK_POINTER_FOCUS_PRIVATE_H_
 #define _GTK_POINTER_FOCUS_PRIVATE_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtktypes.h>
 
 typedef struct _GtkPointerFocus GtkPointerFocus;
 
diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index 07b8f4e152..c38a845165 100644
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -29,6 +29,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gdk/gdk.h>
+
 G_BEGIN_DECLS
 
 typedef struct _GtkAdjustment          GtkAdjustment;
-- 
2.30.2